bitkeeper revision 1.1210 (42135d344yR5vSwI1O6BZ3rfVvGIJg)

Don't depend on auto-generated header asm-offsets.h.
Signed-off-by: keir.fraser@cl.cam.ac.uk

diff --git a/xen/Makefile b/xen/Makefile
index b553f0926d697d538b4d5ad870b243b2aa44691b..802ee23542e04e191bd5eac35809dcb49dee867b 100644 (file)
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -99,8 +99,7 @@ include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s
          echo ""; \
          sed -ne "/^->/{s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; s:->::; p;}"; \
          echo ""; \
-         echo "#endif") <$< >$@.tmp
-       @if cmp -s $@.tmp $@; then rm $@.tmp; else rm $@; mv $@.tmp $@; fi
+         echo "#endif") <$< >$@
 
 .PHONY: default debug install dist clean delete-unfresh-files TAGS
 

diff --git a/xen/Rules.mk b/xen/Rules.mk
index 4c2c8c178ca0bc3f087904f2b0a02e67e001253c..0d8a37bf4d1c73e6bdeb7b73ca8c582fb414e7d0 100644 (file)
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -21,7 +21,8 @@ HDRS    := $(wildcard $(BASEDIR)/include/xen/*.h)
 HDRS    += $(wildcard $(BASEDIR)/include/public/*.h)
 HDRS    += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/*.h)
 HDRS    += $(wildcard $(BASEDIR)/include/asm-$(TARGET_ARCH)/$(TARGET_SUBARCH)/*.h)
-# compile.h is always regenerated, but other files shouldn't be rebuilt
+# Do not depend on auto-generated header files.
+HDRS    := $(subst $(BASEDIR)/include/asm-$(TARGET_ARCH)/asm-offsets.h,,$(HDRS))
 HDRS    := $(subst $(BASEDIR)/include/xen/banner.h,,$(HDRS))
 HDRS    := $(subst $(BASEDIR)/include/xen/compile.h,,$(HDRS))